The English word «Church», like many other terms in theology, has picked up so much baggage and comes from such questionable origins that it is no longer helpful in discussions like these, but there are few handy alternatives. (nakedpastor.com)
The only thing I'd add is that if you have a lovely bedframe you're loath to part with, getting a good sturdy bed guard worked as a handy alternative to the mattress on the floor thing for us. (hobomama.com)