A bit of reorg for bower consistency.